fixes for 2012