Fixes for newer versions of automake, thanks Zachary Parchman