Fix break build and datetime picker bug