Fixes for the rest of the issues that I found

Here are fixes for the rest of the issues that are in the queue. If you are ok with what I have done, you can close out the issues.