General improvements
Fix for #11