Some design fixes
Additional design fixes