@ -> \ and other fixes