Fixes.

See commits.