Misc Fixes

A few issues were closed prior to this PR