fixing some things that don't compile in slc6 version of 5_3_15