fixes for autotools build