Minor fixes

Just a few minor fixes all around.