2011 App fixes