various simulation fixes for the multi-beacon case