fixing errors that show up in 5.14 and not on 5.10