Fixing some commiting issues