Clean up / resolve a handful of warnings

I noticed these while setting up z-push this morning; they're all safe/simple changes - I suppose the iPhone-centric change is debatable. :)