Slight fixes for VC++