Fixes from Sravan and me