Minor Fixes and Updates