Control class fixes