Fixes for analysis refusal