Fixed a couple of remaining bugs after the JWx rewamping.