Sublime fixes