Merge "Size and offset fixes to compile for 64b host"