Updated wrappers and errors