Various cosmetics and fixes