Fixed anticipated bugs.
Merge branch 'allfix'