[MIN] cleanups
[FIX] Core, disk access: integer overflow