misc fixes and adjustments to reduce warnings compiling against 10.10/ios8