Fixed build warnings
Fixed shadowed variable warning
Enumerate all photos not just saved photos.