Commit fixes