Fix up button disabling