Fix analysis files so they run (though not correctly yet)