False Positive Detection Support and minor bugfixes