Minor changes for design time