Fix compilation errors for modern Xcode versions#398

and wants to merge 4 commits into

scrod:masterscrod/nv:masterfrom

and:masterand/nv4:masterCopy head branch name to clipboard