Minor fixes for the last eight commits.