Additional Commander 2013 fixes