Fixed more new syntax back to old