Fix depth issues