More minor R handling
Handle None maps correctly