More changes to make things compile on more platforms