Update completion scripts to be more proper