I'll fix this one myself. For the rest, the PR looks ready for merging.