Fix initial selection problems