Selection bug fixes