Fix some build failures and add some small enhancements to build-aux

%{all_commits}