A few small issue fixes

Just a little cleanup.