May 2014 fixes