Fixes for BETSurface