Fixes for latest Textmate.