acu43764 fix bugs discovered during right_infrastructure_agent integration