Fixes to avocado for building a standalone JAR.