Fixed some typing issues