Mouse pick improvments