changes to support capes-pj environment