fixed minor issues regarding 8MB boundary