Fixing stuff that was messed by git