Fixes for OS X Terminal