From codon

Mostly changes to support running on Bamboo.