Fix primitive conversion in Maps