Fixes to comply with code pro audit. rdlarkins