make NSBlock additions AppStore-safe, header fixes