fixes some contexts