Fix type parsing for changed vars