More mode spacing fixes