various fixes for jackson serialization