Fix activity ordering