Fixes to incoming data processing