More adjustments related to bug #303. Adjustments in the model being analysed as well.