Small cleanup.
Small fixes.