Fixed messed up commits