Fixes a number of minor design issues