Refixes for the analysis engine