Fix intial breakage on 3.1

Signed-off-by: Willi Ye <williye97@gmail.com>
fix some derps

Signed-off-by: Willi Ye <williye97@gmail.com>