Fix common Surface problems using the Surface Diagnostic Toolkit

Top