Bug 1057377 - Bug suggestions & blacklist fixes

See individual commit messages for descriptions.