Minor Fixes

Just some last minute minor changes