Fixes for VC++