slightly improve build infrastructure