Fixes bugs with variable debug information tracking