More cosmetics fixes