Minor aesthetical fixes