More work towards WPA build.