Fixing the packed structs