Let's fix some stuff, even though the API doesn't seem to work properly...