Fix some intersection logic