Few more bugs corrected in enable/disable features