Fixes to make it possible to drop jar into existing distribution