Some button fixes