Fix missing constants
Tidy up and bug fixes
Merge branch 'master' of https://github.com/AdoptOpenJDK/jitwatch