Fix Common Surface Problems