Some quick fixing of errors