Fix analysis models