Fix issues found in testing using newer base-1.2.jar