More Theresa fixes

Fixed random things on my list