Just a bunch of small improvements to the JCP