2011 and 2012 fixes