Some design bug fixes