Two small broker installer fixes

The fix to the RH installer is actually a bit of a whopper, and we need to make sure that other installers don't suffer from the same flaw