Minor additions for merging into master