Review and fix block implementations