Fixing the 2 remaining programming reported lint issues