Correct a fault and couple of incompatibilities.
Merge branch 'master' into jdk7