Fixes for autonomous demo page