Fixes, mainly for Clang/Mac, from Cinder.