Fixes for helper loader/broker configuration