1377 - Fix various issues with current blacklist code

Before publishing the official patch-set, here are a few fixes I've applied to the current state that should become merged into your development branch..