fixing sal violations