Misc designfixes