Some quick misc fixes