Some fixes due to failing tests.