fixes for cap 3.1