Various fixes. Can't name them all :D