Fixes from Ben

Merging this to master