Some quick changes due to new handle