Changed '//' to '||' (same effect in these places) for 5.8 support