fixes for cap