Fix last failing tests and make closure happy.