Nestable fixes