Fixing Profile controller, etc.