Post WIP fixes: part 2