Small changes

- some small, non-user, changes