Minor fixes to the toolkit