Minor fixes related to address serialization