Fixes for visual studio (compiled using scons)