fix 5.4 static errors