Post-WIP fixes