Fixes for new processing