Some small changes to avoid chaining