More fixes for running as subdirectory.