Fix typing errors