Made it easier to build mailcore