added some fixed mentioned on the mailing list