Minor fixes for deployment as uberjar