Few cosmetic fixes