Small changes to particular files to fix issues relating to display of correct values, etc.