Some edge cases that were blocking analysis fixed