Fixes for interlock