#18 fix all undefined notices