Update to 3.6-SNAPSHOT, fix jar problems