1.0b1rc2 fixups

Merged Nick Bearson requested to merge 1.0b1rc2-fixups into master

small fixes from 1.0b1rc2

Merge request reports