Adds guard around pointer reference for basic types

Fix package name

Adds reference in gen_map elem fn