Make some changes to allow 'lein uberjar' to complete successfully