Introduce small fixes.