Bunch of C & Objective-C tweaks