Fixed issues with running on real hardware.