HIL bugfixing