2c and fixes for broken framework code