Small changes suggested by Marek in code review