Portability fixes. Who am I kidding, of course this won't fix anything.