Fix fucked up commits