A whole bunch of fixes to minor design issues