Fixes a couple of design issues