Fixes.

See commit log.