fixes to appease static analyzer