Finally, add missing commits, fix use statements.