Fixes for Issue 11