startup context fixes