smaller fixes.