Finalizing Fixes