Fix dllmap generation
Merge branch 'var-fixes' into p-master