diff --git a/lib/arc/storage/s3.ex b/lib/arc/storage/s3.ex
index cd15eba..b7a7492 100644
--- a/lib/arc/storage/s3.ex
+++ b/lib/arc/storage/s3.ex
@@ -6,7 +6,6 @@ defmodule Arc.Storage.S3 do
     destination_dir = definition.storage_dir(version, {file, scope})
     s3_bucket = s3_bucket(definition)
     s3_key = Path.join(destination_dir, file.file_name)
-    asset_host = asset_host(definition)
     acl = definition.acl(version, {file, scope})
 
     s3_options =
diff --git a/lib/mix/tasks/g.ex b/lib/mix/tasks/g.ex
index 1992035..090dbc0 100644
--- a/lib/mix/tasks/g.ex
+++ b/lib/mix/tasks/g.ex
@@ -46,13 +46,13 @@ defmodule Mix.Tasks.Arc do
     end
 
     defp generate_uploader_file(model_name, project_module_name, path) do
-      model_destination = Path.join(System.cwd(), "#{path}/#{underscore(model_name)}.ex")
+      model_destination = Path.join(File.cwd!(), "#{path}/#{underscore(model_name)}.ex")
       create_uploader(model_name, project_module_name, model_destination)
     end
 
     defp generate_phx_uploader_file(model_name, project_module_name) do
       app_name = Mix.Project.config[:app]
-      model_destination = Path.join(System.cwd(), "/lib/#{app_name}_web/uploaders/#{underscore(model_name)}.ex")
+      model_destination = Path.join(File.cwd!(), "/lib/#{app_name}_web/uploaders/#{underscore(model_name)}.ex")
       create_uploader(model_name, project_module_name, model_destination)
     end