Fix z-index to work better with oC7