Fixes in the processing