Alias fixes + subl tweaks