Fixes for March 2013 bug week