different small fixes -- almost all CBMC tests are green (up to the loading of results)