Fixed Java generics rendering, minor other fixes.