Fixes based on tests