Two fixes regarding the analysis model