Focus fixes.
Cleanup