Latest fixes based on tests.