Cosmetic stuff plus a minor fix