Fixes for empty values.