Minor improvements to P04 and P05.