Fix ui-button failures