trunk fixes