BetterDirectionality fixes: