Minor improvements

see commit messages