Wrong type corrected and cosmetic fixes