Additional Minor Fixes