Important finalizing fixes