Some misc. cosmetic changes