Slightly improve build