Making sure Activity etc. is in there