Incomplete list of updates

I had to make these changes just to get it to allow
`jpi server` to work.

These are obviously incomplete, though.