Various deployment fixes