Fixes for demoability