Small clear-fixes.