Fix more derps which caused compilation errors.