Various updates to suit ggvis