minor fixes to make code compile in SLC 6