Fixing issues with commit