Some quick needed fixes