Fixes from me and Sravan.