Minor Fixes/updates