Review and fix block implementations

inject