CLUB-581, cosmetics and fixes

No we do not need that anymore ;)