Fix some hbox issues