I found some more of these issues and fixed them.