Commit 10-1-1

Bug fixes from Commit 10-1.