Fixed env
Fixed <leader> aliases