Fixes to update master version.
2 files changed