Some cosmetics changes