Fixes

Some small fixes.