Fixes for spaces in values