All the other fixes