Fix for some crypto sins.