Cosmetics and fixes