More fixes for intercassa
More more and more final fixes