More 5.3 compatibility changes.
Merge pull request #1 from bexarcreative-daniel/patch-2

More 5.3 compatibility changes.