Varoious cosmetic fixes