[FIX] Fixes related to retrieving fixes in subdirs.