Minor changes to typing