Minor Fixes Work