Fix some weird git issues