Minor authorization enhancements

@devcritter can you look at this whenever you have a chance, low priority.