Keep GNU automake 1.14.1 happy

Some minor changes to be compatible with Automake 1.14.
It works for me, but please test it first :)