Minor small fixes.