Fixed more 5.4 syntax