Fixes for button disables