Wrapper, delete, other fixes