Fixes to new coke code, appears to work now

UCC git Repository :: git.ucc.asn.au