Fix some issues caused by VS compatibility changes