fixes for when disabled