Avoid compiler warning about integer types
Merged origin changes