Fix rebuild and recheck task