Major fixes over purit build