Hot/cold partitioning update, sub-patch: fix alignment problems