Fixes for receiver