Fixes minor protocol flaws.