Small maintenance additions to automake etc.