Minor Fixes

Please pull.