Fixes to minor issues