Small Changes and Fixes