diff --git a/vars/invariants_minipix.vars b/vars/invariants_minipix.vars
index 29c75f5..413ee07 100644
--- a/vars/invariants_minipix.vars
+++ b/vars/invariants_minipix.vars
@@ -4,9 +4,10 @@
 
 pkgp_invariants_minipix_is_newer() {
 	local _new_fname="${1}" _new_ts="" _old_dname="${2}" _old_ts="";
-	_old_ts="$(stat -c %Y "${_old_dname%%/}/${_new_fname##*/}")";
-	_new_ts="$(stat -c %Y "${_new_fname}")";
-	if [ "${_new_ts}" > "${_old_ts}" ]; then
+	if ! _old_ts="$(stat -c %Y "${_old_dname%%/}/${_new_fname##*/}" 2>/dev/null)"	\
+	|| !  _new_ts="$(stat -c %Y "${_new_fname}" 2>/dev/null)"; then
+		return 0;
+	elif [ "${_new_ts}" -gt "${_old_ts}" ]; then
 		return 0;
 	else
 		return 1;
@@ -26,7 +27,7 @@ pkg_invariants_minipix_all() {
 				ex_rtl_fileop cp_follow "${PREFIX_NATIVE}/bin/${_fname}" "${PREFIX_MINIPIX}/bin";
 			fi;
 		done;
-		for _pname in $(find "${PREFIX_MINIPIX}/bin"					\
+		for _pname in $(find "${PREFIX}/minipix_dist/bin"					\
 				-maxdepth 1 -perm /a=x -type f -and \( -not -name "lib*" \)); do
 			if pkgp_invariants_minipix_is_newer "${_pname}" "${PREFIX_MINIPIX}/bin"; then
 				ex_rtl_fileop cp_follow "${_pname}" "${PREFIX_MINIPIX}/bin";
@@ -53,12 +54,12 @@ pkg_invariants_minipix_all() {
 			ex_rtl_fileop ln_symbolic "vim/vim74/vimrc_example.vim" "${PREFIX_MINIPIX}/share/vimrc";
 		fi;
 		for _fname in putty putty-256color screen screen-256color xterm xterm-256color; do
-			_dname="${PREFIX_MINIPIX}/share/terminfo/${_fname%${_fname#[a-zA-Z]}}";
-			if [ ! -e "${_dname}" ]; then
-				ex_rtl_fileop mkdir "${_dname}";
+			_dname="share/terminfo/${_fname%${_fname#[a-zA-Z]}}";
+			if [ ! -e "${PREFIX_MINIPIX}/${_dname}" ]; then
+				ex_rtl_fileop mkdir "${PREFIX_MINIPIX}/${_dname}";
 			fi;
-			if pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/share/terminfo/${_term_letter}/${_fname}" "${_dname}"; then
-				ex_rtl_fileop cp_follow "${PREFIX_NATIVE}/share/terminfo/${_term_letter}/${_fname}" "${_dname}";
+			if pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/${_dname}/${_fname}" "${PREFIX_MINIPIX}/${_dname}"; then
+				ex_rtl_fileop cp_follow "${PREFIX_NATIVE}/${_dname}/${_fname}" "${PREFIX_MINIPIX}/${_dname}";
 			fi;
 		done;
 	fi;