OCD and fixes