Minor bug fixies and improvements
Merge branch 'master' of https://github.com/justm/magnolia