Minor changes to typing rules