Make it a bit more portable.