fixes. fixes everywhere