Fixes

This fixes a bug in the recent roles commit (59f124e162335df696a56e65a4272390fbf9146f).  It also adds a minor fix for cases where sometimes offers aren't declined, even though they should be.