Second request

Small changes, that can be useful not just for me.