Updated -c option and more fsuuid checking