a couple of fixes for deployment