overall context fixes