Minor updates to Context classes