Fix checkstyle errors in sal-compatibility