Various fixes

Commit messages have all