Fixed some selector bugs