Activity class fixes