More bug fixes, for epel and for directories