improved construct diagnostics