Fix chunks checking & scheduler