fixed some cases where certain buttons shouldn't be disabled but are