Minor fixes, cosmetic changes