minor tweaks for latest xcode