more fixes for cap 3 deployment