Minor Fixes/Changes