Change some function defaults to NULL