Fix undefs