Some quick changes