Some quick changes to remove false positives