Fix notices in generator