Some more fixes to the processing