Last minute deployment fixes