Small changes

Just some small changes that make sense for our environment.