some NULL fixes