Forgot to include two little changes in those PR's