Last fixes...hopefully