Changed how things are marked disabled