I reverted the change that fixed pushable under combos, since it caused other problems. I don't see a reasonable way to fix it, so it'll just have to remain an issue for now. #2 should still be fixed.