Compile fixes for organ/reagent code.
Merge pull request #3425 from Zuhayr/feature

Compile fixes for organ/reagent code.