A few minor changes/fixes

A few minor changes/fixes