Fixes a few errors and missing things in the integration branch submitted earlier.
« Back to merge proposal
Fixes a few errors and missing things in the integration branch submitted earlier.