Various Small Changes

Various small changes. Please see commits for details.