Fixing depl issues