VOYEUR: Fix a null pointer assigned to 0
VOYEUR: Some more clean up in FILES