Small changes made to get 20130416 version.