Technical quirks during integration

Other 8fig issues: