Fixes for a Sublime Text 3 compatibility