Fix ALL errors and warnings because OCD