Basin Selection Fixes