#5 Minor design fixes