A few final fixes before the merge.