fixes to some support handling functions