A bunch of fixes of using old type of proc

Now it all deconstructs properly