A couple things missed in uninstall function