Minor design bug fixes