Some minor improvements and new build jars