Various fixes for Lightning/Sublime usage