Fix datespec support