27 small fixes for context issues