Fixed type errors and using None in dispatch fns to avoid spamming