Fixes towards perfection.