various changes to run locally without errors