Misc cleanup
Handle cases where this.date is undefined / falsey