More select fixes