Some more fixes related to caps_per_proc_variable removal