Bug fixes throughout
Merge branch 'my'