merge-related fixes;

With this, "make install" works again.