Build fixes for older automake