Reconstruction fixes.