Finalizing fixes