Some quick patches