More cosmetic changes and small fixes