Oh, btw, also make it work, since the build was completely broken since the recent -K refactoring :0)
