Fixes

See commit history, these are very small fixes.