Small fixes for deployment