More minor design changes