Fix weird crashes
Add name completion