select-org: Fixes for travis