Small fixes

See commit messages!