Adaptor: Fix Klocwork issues