Small changes to logging data, and filesystem