Issue 1 deployment fixes