+1 Please remove from the PR just so we can discuss and eventually merge each fix in isolation.