Minor improvements to Plan J.