Fixes 'Invalid Changes data' and returning changes when dir is already bootstrapped

These issues are mentioned but not addressed in #5615