Refined disabled states