A couple of fixes to get usage code to run.