Some more improvements to wms cascading issues