Fixes in order to succeed with check task