Fix minor typing issues