fixes to wrong context on component and model changes