Fix design bugs.