Improve build behavior