Some quick fixes