Fixes for Trac#24