Some more WK2 changes I missed in the previous commits.