Some more fixes for small problems.