Fix momentjs issues