Fixes to files [MJ-374]
fixing activities [MJ-374]