Minor design fixes

Closes #608