That's the only unaddressed comment. If you don't care that much about making these changes, the rest is ok to merge.