Small changes to make the thing run properly on the Linux VM