Fixes Momentjs usage and timestamps, Previous user still broken