Fixes (works with existing repos)

Also improve OS X packaging for Java 7