Adding check for special variable, fixing version check.
Fixing missing variable checks