Slight changes to get less warnings