Fixes for recevier