Fixed a few missed bugs