Continue to support autotools... for now
CMake build fixes