Minor surface class fixes