Few fixes, mainly cosmetic