Match Nick's changes to PROMS-Java.