Fix calls now that we don't do relative imports