Z-indexing fixes