Small changes to make logging clearer