Forgot to fix some compile errors from last commit