Fixing some profile stuff

Fixes some stuff, but not all