Small-logo related fixes.