Some small changes in setting up things