Commiting Fixes