Compile fixes for organ/reagent code.