Fix some issues with duplicate authorization checking