Smaller design fixes