Temp minor fixes