Fixes for define-values