Fixing compiler issues for VS13