cleaning up SAL warnings