Hopefully improved subdir handling