fixed up changes from javacfongi testing