Minor alterations so that we are able to run out of the box