Minor Changes and Fixes