Small fixes

Some small fixes.