Bug fixes for optional vals.