Final Fixes.

Sorry my fault.