Avoid some 2014 problems