Fix activities 1 and 2