basic fixes on Disabled controls