Fix mail & libraries