Minor fixies + new JVM args for testing