Couple fixes

Re-implemented fix that was causing issue with Team Draft Preferences.
Fixed several issues that were causing problems with drafts.