Fixes

This closes a bunch of minor issues