Fixes for new inline diagnostics