Resolve compatibility issues with react-native v0.47.0

Merge changes from @slycoder to address build issues with recent react native release, plus some cleanup.