Small updates to map chunk handler for data safety.