WIP More fixes