fixed minor enable/disable bugs with certain controls