Fixes to receiver