Fixes

See commit log.