Updates to work with latest CBMC trunk