Other fixes. Still broken. Mentioned in Issue #27.