Minor fixes

See commit messages
fixed