More fixes to make sure profile save works properly.