Fix untested stuff