Fix a number of E_NOTICEs