surface bugfixes