Minor fixes in advance of full offline access.