More tiny fixes.