Mini-Fixes
Finishing touches.