Fixed 5.4 issues