Fixing references to private vars