rarian:some fix and rebuild