Update various items to make the mixin linter happy.

Signed-off-by: SuperQ <superq@gmail.com>