Fix up z-indexes