Add some stuff whose need became obvious when I tried to use it