Improve build/compile