Fix grant type extensions