Minor Fixes and Changes