Fix implicit z-indices