WIP fixes more