Fixing Betacode et al.