post CR forgotten fixes.

#time 5m