Minor tweaks (after much research) to get things working for Joyent