Fixing more prefix issues.