Block button fixes