Fixed 5.3 compatibility and Tracy compatibility