More design corrections