Commit fixes due to rebase