For upstream/fixes

Some small fixes.