Build/test fix.