Adjust for clang
Some more adjustments for clang; Fix reported warnings