intermediate fixes