diff --git a/autogen.sh b/autogen.sh
index 112365ae2..5125c8044 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -61,5 +61,5 @@ autoconf
 cd ../..
 
 # Run configure for this platform
-./configure $*
+./configure "$@"
 
diff --git a/src/tag.c b/src/tag.c
index 506c9d5f6..388c1fd9d 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -315,14 +315,14 @@ MpdTag * flacMetadataDup(char * utf8file, int * vorbisCommentFound) {
 	return ret;
 }
 
-MpdTag * flacTagDup(char * file) {
+MpdTag * flacTagDup(char * utf8file) {
 	MpdTag * ret = NULL;
 	int foundVorbisComment = 0;
 
-	ret = flacMetadataDup(file,&foundVorbisComment);
+	ret = flacMetadataDup(utf8file,&foundVorbisComment);
 	if(!ret) return NULL;
 	if(!foundVorbisComment) {
-		MpdTag * temp = id3Dup(file);
+		MpdTag * temp = id3Dup(utf8file);
 		if(temp) {
 			temp->time = ret->time;
 			freeMpdTag(ret);