Fixing stuff for setting up on a new machine