Fixing some misplaced changes