Update class fixes