SAMZA-161: Fix the warnings in check task