Further changes to the os setup scripts