Fixing old TODO tasks from proc and vm