Some more small design changes