Fixed some activity stuff