fix errors after recent rebase to master