Improve build and ci