diff --git a/containment-tik-img-to-rpm b/containment-tik-img-to-rpm
index d3c980a..db642d5 100644
--- a/containment-tik-img-to-rpm
+++ b/containment-tik-img-to-rpm
@@ -22,7 +22,7 @@ fi
 log "tik-osimage-* found: Creating RPM from any tik-osimage-*.raw.xz images"
 
 for f in ${img_dir}/*.raw.xz; do
-	base_f=basename ${f} .raw.xz
+	base_f=$(echo ${f} | awk -F '.raw.xz' '{print $1}' | awk -F "${img_dir}/" '{print $2}')
 	image=${base_f}.raw.xz
 	json_f=${img_dir}/${base_f}.cdx.json
 	log "[${base_f}] Parsing ${json_f} to populate variables for RPM .spec"
diff --git a/containment-tik-img-to-rpm.spec b/containment-tik-img-to-rpm.spec
index 1f56afe..b9157c4 100644
--- a/containment-tik-img-to-rpm.spec
+++ b/containment-tik-img-to-rpm.spec
@@ -27,7 +27,9 @@ Source1:	image.spec.in
 BuildRequires:  filesystem
 BuildArch:	noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:	jq
+Requires:       jq
+Requires:       gawk
+Requires:       coreutils
 
 
 %description