Fixes to allow running on live server.