Smaller fixes.