Fixes to get tests running on PS 1.4