Made build more portable