Fixes based on first group of tests.