some "missing-@" fixes