Fix some corner cases: mostly tulip fest around Kent & Albert