Few simple changes

Next one is bigger and will come in a proper feature branch.