Minor Fixes

Minor changes to some small stuff