More small design changes