Some fixes to get compilation and uberjar working