A few minor changes

Hi Tobias,

I still haven't got MMR-70 so cannot check my changes related to single-threaded version and I'm going to travel for the rest of the week so I've decided to add only minor chages for now.

Regards,
Andrey