Add escape hatches & fix compile errors - more incremental checkin