Fix design bugs