Fix problems that came in with latest merges