Fixed MORE warnings