Commit fixes resulting from merge