More 5.3 compatibility changes.