Fixed wrappers and scope