Fix up load paths