Fixed some gittering issues