Minor Surface tweaks.