Fixup: Add removed line
Fixup: z index to abstract shell surface