Also, fix corner cases for misaligned sizes

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>