Small fixes for automatic fsuuid to be more robust.