Some fixes to merging pull requests