Minor fixes

See commit messages