Some last fixes.