Fix some z-indexing issues