Changes mainly to fix automake problems