Fixes for mapping vals