Fixed some commit problems from the last few days