Fix up some more hlint errors
Add tab completion