Fixes to autotools