More proc fixes

Here is another preparation for the proc merging.