A few fixes, most notably a fix for Issue #48