Make a bit more portable