[WIP] Fixing for the processor refactoring.

Signed off by: Daniel Bucher <daniel.bucher88@gmail.com>