Disabled state, fixes to rebuild