Downgraded Java version to v1.6, other small things.