Some aesthetics fix