Latest fixes
Cosmetic fixes