Some quick fixes.