Various catchup fixes.
Includes text to resolve https://bugs.freenas.org/issues/4977.