Fixes for ReactiveCocoa 2.1

Tried with the latest version of ReactiveCocoa.