Bug fixes: Mapper tweaks not passing primary keys as arguments