Some minor autoconf/automake fixes