Fixes for VS