Various fixes for things I missed, please no more