Interlock changes, mostly