Minor fixes

Here are some minor fixes.