more context fixes