host class fixes