Fix some mess ups