Two improvements

[Joebugs]

Andrei,

If it is possible and does not require to much time can you do these two minor improvements:

1.