Fixed some more typing issues