Re-enable surface attach.
Volume limit fixes.

Don't quite know what I was thinking...