Fix some issues with beam receivers
Merge remote-tracking branch 'origin/master'