Small design corrections