Finalize for release. Fix property check.