Some quick cleanup to resolve some errors