Merge pull request #2266 from ey6es/visagefix

Fixes for Visage compile.
Another compile fix.