small context-switch fixes :)