Sublime Text 3 compatibility

Small changes for ST3 compatibility