more deployment fixes