Adopt bundle fixes from fix/specs