Minor Fixes

More tiny batch changes.