More WIP fixes