EST-310: Fix orphaned disableXxx
EST-351: fix the build; little layout change