Fix some depth issues