Small bugfixes (and blacklist update)