Fixes to enable running of the analysis