Fixing further issues with PH 5.3 compatibility that weren't brought up ...

...by unit tests.

Signed-off-by: Ben Corlett <bencorlett@me.com>