More fixes for uneven boundaries