Slight changes to some things