= Fixed notice warnings