Finalizing Fixes.