fixes for cap 3