Yet another WKR build fix. Sorry for the mess. It seems like I can't win today :(