Int -> Long
Fix option size calculation for primitive types
Fix option size calculation for embedded messages