Fixes typing issues