Various bits of broken no longer broken.