* A few minor fixes, mainly for buttons.